merge

diff --cc linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
index b50d21628cb09bf26ad8cdd3b000ca2193e2ffd2,a77a4166a2ff9bc664c91d0b00953c4fbe37a775..d24bd833e968460231b0219fc3c580ac100de9e6
--- 1/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
--- 2/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
@@@ -32,7 -32,7 +32,8 @@@
  
  #include <xen/interface/xen.h>
  #include <xen/interface/sched.h>
 +#include <xen/interface/dom0_ops.h>
+ #include <linux/errno.h>
  
  /* FIXME: temp place to hold these page related macros */
  #include <asm/page.h>

diff --cc tools/libxc/xc_linux_build.c
Simple merge

diff --cc xen/arch/ia64/vmx/vmx_hypercall.c
Simple merge

diff --cc xen/arch/ia64/xen/process.c
Simple merge

diff --cc xen/include/asm-ia64/mm.h
Simple merge